From b004706009f9ad19e34a82928b383345b50a5075 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sat, 6 Nov 2021 18:26:41 +0100 Subject: [PATCH] Revert "sizerequest: Only check reported baselines if requested" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit cf7fa931d380c6d205478c87f0f3973f496f9d2a. We store the baseline in the cache and we do not know if baselines might be queried in the future. So always store them. No reftest because I don't know how to write one. premature optimization == √😈 --- gtk/gtksizerequest.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gtk/gtksizerequest.c b/gtk/gtksizerequest.c index 45770d5498..a0f066b997 100644 --- a/gtk/gtksizerequest.c +++ b/gtk/gtksizerequest.c @@ -139,7 +139,6 @@ gtk_widget_query_size_for_orientation (GtkWidget *widget, int *minimum_baseline, int *natural_baseline) { - const gboolean baselines_requested = (minimum_baseline != NULL || natural_baseline != NULL); SizeRequestCache *cache; int min_size = 0; int nat_size = 0; @@ -361,7 +360,7 @@ gtk_widget_query_size_for_orientation (GtkWidget *widget, nat_size = adjusted_natural; } - if (baselines_requested && (min_baseline != -1 || nat_baseline != -1)) + if (min_baseline != -1 || nat_baseline != -1) { if (orientation == GTK_ORIENTATION_HORIZONTAL) { -- 2.30.2